Working on validation - still not a useable version