done with users, just need to get spacing right