need to reconcile with header, hopefully last refactor