Update Project2

Beginnings of an overhaul.