WIP better macroblocks