just sorted a couple of things, stuff isn't working yet