The current architecture is somewhat repetitive and not very cleanly structured.
Also, there are not unit tests.