todo working a little more