Moar work

STILL not functional