Tested fully working

Look very carefully at the pictures for more cosmetic details