- Rewrote type system (WIP)

Most tests are passed