Made some progress added things and such