fixing up naming convensions a bit and starting to work on data validation