(GX) Input rewrite pt. 2 - buggy and error-prone right now