Snapshot: Optimized a little bit, changed some classes to ids

Still needs work and testing