Added work
Not so much redundancy now, fixed a few problems with the validation as well