manually merged andy's stuff let's hope it works
started pormodoro but i made bug, back to master