Lot's of stuff - bad commit message