cleaned up, script is now a class, jup