First code overhaul refactoring

Also began implementation process for graphical display