added casual solving
works for multiple users now
few changes
fixed merge conflicts