step 1, three separate classes, new magic number
2 files changed