Start of adding core to main project