Added some todos, working on typing sytem, etc.