Began - Needs Completing

Awaiting testing of current code before proceeding.