More stuff, some bits hacky