Move helper funcs into mark def
Move helper funcs into mark def

rhencke/lyra,kidaa/lyra,rhencke/lyra,jsanch/lyra,jasongrout/lyra,rhencke/lyra,jsanch/lyra,uwdata/lyra,jasongrout/lyra,uwdata/lyra,jsanch/lyra,kidaa/lyra,jasongrout/lyra,kidaa/lyra