super duper commit
super duper commit 2
removed unneccary exception
moved inner classes to class files
juice!!!!!!!
s