Forgot to update model while reviewing #24, did it now