working on models
Got some transation stuff working
merged