almost done
Completed and working
Merge branch 'working'