WIP
Working unlayered markup.
More markup / unlayered bugs.