Added stubs and comments for what still needs to be filled in