Adding some files that weren't included in previous commits