work in progress refactor skeletons
skeleton refactors