Merged versions of Jeremy and Jay on 4/7

Includes up to test taking system.