Added Charles' display code with some small refactoring to better match rest of code base