Issue/api completion

OOoh, this is nice, the :camel: thing ! :+1: