need to sort database helper out, it's a mess, a complete mess...