Little bit better, done with the specification now (hopefully)