merged user and citizen models
began updating foundation litcoffee