Added back stuff from previous storm crawler repo