Committing the changes I want to keep
More tests passing