Refactor + Bugfix. Beta 1.1