added TODO comments where needed, so as to keep up to date with what still needs to be implemented