Revert to skeleton (to develop struct in branch)