resolved TODO for enums...made Locators final class...changed one variable to final in UserModel...changed ArrayList to List...