Added rudimentary core structure