Adding lots of code

Copying over my 2.1 project