Working...ish

Yay!