unti testing and some TODO Placeholders