Next big merge, base functionality mostly works now, contains some
portability fixes (lowercase db table names)