1) Added Default Values
2) Changed to pass around objects were currently necessary - addressing Interface via Objects issue on GitHub
Merge remote-tracking branch 'origin/database' into database