Revision 9

Got stuff done :) Break time!!!!