Final Working Checkin. We now need to improve on this base