Quick commit, started laying the ground work for the new features