Added the wrapper back. MAKE SURE TO FETCH AND MERGE OFTEN