Added initializer to typeDefinitions. Refactoring. WIP, wont run now.