Added bunch-o-stuff
Trying to fix sumbodules mess