Revert "Revert "completed 1.1 - 1.3""

This reverts commit 60edc85ae16255932b828fc9a21f26018ab8f584.