Update 1 - added SQL stuff and not much else