It's working... almost