Added TODO
Utilize Query
Inserting
Some hidings