one big panicky commit of a lot of important BOG code