refactor continued - preparing for testing after webexpo :)