Finished v1 of functions to handle display