Jrominson's amazing branch of amazingness

Merge my branch plz?