V2 Mods

added new fields to entities and merged code