Adding some stuff I forgot
merging