some lunchtime changes
can't be arsed with importing these modules
moved to models dir