Basically Finished...

Just need to clean up some errors with validation