Added more stuff, testing