Add remaining skeleton functionality, the skeleton is complete.