Finished model 1, and fixed minor bug in init