Final Commit tested and working

...