Big Changes, now functional! (Still no classes)