More work on post processing stuff (WIP)