Almost done, just have to fix error throwing