Added Database Class, refactored __init__