lot's of tweaks, it's probably pass-offable now