starting to put code back in