variables renaming
almost donegit status