Partial implement of #13 for skills