Cory

Ready for merge to Master. Complete and tested.