Added histogram / start refactoring graphics;