User system working
finished at mhacks;
fixing conflicts