First version with selector working. We need to fix some issues yet.