Added more stuff..getting bored with this though