Dividied functionality in the two files.
Uses validation files
Bump version