Can't seem to keep variables straight. Cleaning up