added x axis!
cleanup! ready for integration