Finishing initial display code, WIP