Ben T added comments
oh god the merge