[WIP] PSM Step 1

This is totally WIP.