Deleted some testing code and added comments & todo's