closed #5, closed #6 and some model associations + DB Update!