Rework things to allow multiple users easly