WIP geard refactor packaging