added some structure to the clientside