Adding part of the systems backend
merging and fixing a bug in users