Another refactor, new graphics