Switched to Active Record
Added Input.patch