partially through refactor of validation to controller. HIGHLY RECOMMEND PREVIOUS COMMIT