Slow on commits. Version 1 is now complete. Refactor needed.