Started work on merging classes and ids

Also started working on the report template