Update first working

Ended up doing the last part of the project in the Update first working branch, and now I want to consolidate and delete the second branch.