Forward engineering work + updated tutorial