Initial round of changes made during first sprint
from 2013-07-03 to 2013-07-04