start of type refactor
Started mangling everything up
on the move