Finish draft for initial class submission