Add almost final version
Merge branch 'AJS' of github.com:mks65-dw/final into AJS