WORKING VERSION
- Re-added Type Rank
- Fixed Bugs