Renaming a few things. Added a refresh method