Merging current students branch to mainline.

we are so nucklehead arent we