Re-wrote leaves. Now just waiting on #179 and they are done