moved some stuff to helpers.rb
pushed stuff around!