Big changes, hopefully fixing some of the previous markup issues