Moved scripts around -- hopefully underscore gets loaded properly now