All validation is now working but the user feedback isn't great.  Will try and clean that up in the morning.