Going to bed, currently doesn't build, check for errors/finish started methods tmrrw