adding upbase, structuring stuff