Version 2.1 Refactor

See CHANGELOG for details