Third Commit

Still mostly foundational stuff