Cleaned pushr program; messing with classes