HW6, pt1
Fixing staging bugs in develop branch.