Almost done; just a few todo's left
Cleaned up some more and started adding form validation