Did some skinning, looks like it should a bit now

still unfinished
Removed submodule dependancy
Removed submodule dep
no dependancy