more testing + TODO