lots more refactoring, changed all @new_rant to @rant reducing complexitiy