Added support for type annotations
Added (awful) loading of types