SO WORKING

See last git commit