Catch up from wednesday
finishing mergin wednesdays stuff