Started implementation of display metadata. Now I need to clean up the code that starts to be a mess.