Fvalidation

overhaul of class names with extra validation added