Finished! - testing needed....

Still need to test but I'm done with the basic structure!