Basic Working System
merged 4/10
more database stuff