Starting to refactor for usability. Interim Check in.