Changes to how the system works, closes #1