Update to v2.1

Uses forge now and is base-classless