Separate class into its own file
Separate display into its own function
Merge branch 'refactor'