Had to rename file due to conflicts with Java-imports
Updated reference to file
Changes and began calculate dates