sounds good. Are you going to try to merge everything as a single commit or is this going to be broken down into something that can be code reviewed?