Change to CursorLoader/CursorAdapter (temporary commit - work not finished)