Completed mode system, implemented original functionality in a Mode
Resolve Merge