Added more code, almost done