Moving stuff to make it fit and move features in from latest branch while still keep plugablility of new branch