Initial Check-in

Initial code check-in from the weekend project, commented and cleaned
up.