added some TODO stuff