Began adding module system to make testing easier.