Started adding tables and models