Massive ability refactor as well as cleanup.