WIP: fix intent service