Working on display code