added tables for express. needs table for equipment
Merge branch 'staging'