Making some progress I think

blek. I don't really know what to work on