- Rewrote type system (WIP)