Stepheng welcome

@qizzoosk can you review my code?