Redoing some axis code. Fixes #12.