First real commit! It works, sorta.