Added beginning work on partial rebuild