#31 #32 Ready to be tested

Code commented and checked Ready to be tested