working things and cleanup
ready for pull
almost working validation