4/16 skeleton done, expanded functionalities