Commiting some more design changes