Added functionality to skeleton functions

Implemented and tested working functions.