Added and started work on XAxis
Broke some things.