Started to flesh out core more. Working on building the logic in the testing files. More to come.