WIP More changes making posts work