a couple todos in models