took out jump for now, cleaned up code