lots of refactorings... halfway through