Need to finish the main graphical features today