Rolling back some changes, still trying to figure out structure.