More work (I work at different pc's, hense why so many commits)