No need for template class anymore
Add upgrader skin functions
WIP, not working yet, saving checkpoint