Lot of changes, not really sure how to explain it, working on getting core running here.