Adding some files left out from previous commit