RUNS: Some code refactoring to make the new graphics api used
RUNS: Added some graphics, adn refactored some graphics code even more.