Advanced and somehow finalized implementation

... on with the tests