Refactor (not finished) post base