added TODOs and stuff