Pull request for excessive meta work

More meta work!
Also features and such