current version
reverted
after a point, a refactoring will be necessary
pom