Refactor/wallposts