Made some of the existing features toggle-able.