Working. Fixed the y bug.