Add Freeze Feature

fixes #69 
fixes #67