Initial commit, tested and working
Merged with inital commit