v1.1 for production
merge conflicts resolved
added notes..code complete