Major Fix #1

It finally works! Yay!