REMMEMER TO COMMIT MORE OFTEN - dont know everything I have done in this commit :(