Type refactoring, phase 1 done (now works again)