working on moving shaving into its own engine