Eric's Big Commit v2: Electric Boogalo

yaaah trik