Add incomplete solution for #28