Added more stuff. Great commit message for great justice