new branch

betere classes
performance increase