Incorporate Chris's molecule stuff