Ben/user spec and more