left todos and some documentation