Adding all the stuff back again....pt 1