commit for the weekend, going away and not going to be working on this