Misc. Work

Not a buildable version.