Initial commit. Added some infrastructure code