Se api

Just for preview. Please don't merge it.
Are you going to address the TODO?