Committing a version that is complex...will need to simplify