refactor to barebones complete