Initial Fork, version 0.1.0
Move validation back to controller