Feature/all working

IT WORKS!