Code Check in for review

Ready for peer review