Prep work for initial release