Just needs a few validations and cleanup

Love that! never trust your users.