Commiting some changes, more to come