Added achievement model and some missing pieces