move to make things a bit more generic
addd heading support