Make it work, mostly (still sucks)