Updating to make work on the Pi, removing sqlite code for the moment