Updated version of Project1

Not complete, but want to be able to access at work, so I'm checking it
in.