First (WIP) draft on new s-s apis