Almost done, debugging errors