checkpoint

(some horrible code; will change)
Merge branch 'alt-abd' of github.com:seplogic/corestar into alt-abd