Did stuff.
Seperated common lib out. Still some stuff to work out.