Started adding actual models and adding appropriate setup in the code