Now passing around Paint instead of being static