Closes #15
Clean up of Foundation 5 Stuff left over
Closes #12 and some other cleanup