Final commit for milestone, everything works, need to do some finalizing of how we are going to do things, and clean up some code, but it works