- Rewrote type system (WIP)

Semi-working now