Finished basic skills implementation