made minor changes, still need CRUD options..