Fixes and first implementation of final API architecture design; it works!