Started working on the Core