Prep for dev hand off