Added some basic TODO
Updated to read DB