Commiting all my changes to prep for a merge