Vaguely works, adding database shit now...