tests passing, deletions committed
extended user model