Lots of additions, project almost done