Starting thumbnail refactor