Finished all validations, broke a bunch of tests