End of Day 20140611

Final preliminary coding, ready for test and deployment