Added more ability/user model stuff