Added sub command skill, tidied some methods