Laser refactor, add graphics