almost done w/ cal handling