Added stuff for axis, but it's not completed yet