Lunch Break Updates #1

I added some more code to the project over my lunch break.