Finish 7 by Spring 2016 Update #1