trying to refactor
mostly working again