Started adding hand display, also refactored