some changes to models etc., still wip.