Trying to fix code hinting weirdness

Half fixed it.. Will return to it later.