more infrastructure and working on crystal model