WIP - fix up validations