Maybe try a shed box for the retained shed? Sounds like it's going dowhill but it doesn't hurt to give it a shot!