Refactored Models + started JS