Commit before pulling
merging stuff
Fix add and subtract, untested