Kyle Goderwis - GKOP-867

Welkin #5