Fixed TODO, Database Stuff
Fixed DB and python coint