Arnold Gálovics

Build is failing.

@hmg65 PR is conflicting and there are build issues, please check.

@francisguchie I commented a couple of things that need to be addressed first. Hope that makes sense.

Please do a `./gradlew spotlessApply` and then the tests will pass.

PR Conflicting + the build is failing.

PR conflicting.

PR conflicting.

PR conflicting.

PR conflicting still.

@hmg65 PR is still conflicting.