Started separating mode logic into individual classes so as to be more modular in the future.