Did some playing around with intent handling, this will all go away probably