#7 refactor ( this is actually #6 and #6's commit message should be 'add macros to database.js')
#7 refactor ( this is actually #6 and #6's commit message should be 'add macros to database.js')

wadecon/wadecon,wadecon/wadecon