polishing up
ready for first code review