In Progress

Thumbshots upgrade