Resolving merge conflicts...
Merge conflicts resolved. Still got a transition bug though.