begin a proper refactor