Final Commit For April 2

Updating so I can work from home April 3.