Recovered from a bad merge. Box is now functional