purge/refactor beginnings