WIP refactor block markup to be saved and loaded with the right format