Added foundational stuff
merge