Some restructure, fixes. Implement Update/Delete!