Initial refactor for buckle
Initial buckle-ization of graphite module