menu_item sorta works now.... maybe not optimal but not broken horribly either.
Merge branch 'master' into josh-work