In the middle of making major changes, this a mess