Dev 1.2.1

Source code for development build 1.2.1 (may have some WIP code for 1.3)