added Gene, added TODOs