Working, need to fix repaint/update issues!