Clean up
Add todo
Clean up sqlHelper (basically reimplemented it)