Refactor and start to add ability to style content.