Halfway through changing stuff (wont compile yet!)