Some more changes made while testing in office... Lots of temporary logs included