Ready to present, some cleanup will be checked in later in the week