Potential final commit lots of features added and a few bugfixes
Potential final commit lots of features added and a few bugfixes