Mid-day commit #2

Forgot to add all commits. Derp.