Much improved database.sql
More SQL improvements
Setting up the fondation to use of siteid variable
Testing of step 2 now works with needles