Attempt at repaint
next attempt
Linting and cleanup