Cleanup, TODOs
Basic form validation