Heavy refactoring in progress...
NEW features on the way!