changed name convention, established connection to db