Reworking to get thumbnails/meta/editing all working properly