Moved stuff around and added a stub to generate references.