Added todo
Removed duplicate query
Insertion now works