changed to access my db
no more switch statements
Merge pull request #30 from send0013/develop

Develop