Added some more erb stuff, push for Mark to add more