removing unnecessary code
more cleanup
no need for that method
further cleanup
further work on broken or missing code but now I need to figure out the group aspect of all of this. Few easier things to add in terms of updating things and what not