Move more code around

Buffer var allocation coming into shape
5 files changed