New Entities

Started the new entities
Started the new tech system
Continued to add functionality and clean things up