Fixed #2, Fixed #3 , Started database actions