Lots of big changes but mainly still a big mess
bg tweak
Merge commit '186a73f4b02cc82e935165822f772e2aa62f4e30'