fixed DB pulling and pushing still need to work on edit