Almost complete, investigating errors