Done:
- Refactor
- Minor tweaks in the interface

To be done:
- Investigate NPE (Grrrr....)
- Tweak the interface more