I dunno why all these deletions :? changes on framework since pull request was done :? Waiting for @sempervictus feedback, if needed conflicts should be solved.