X-axis works is integrated. Now we need to rework the code. It's a bit bloated.