worked on #19:
- fixed a lot of imports, typedefinitions and so on - we're almost there!