Committing to update code state. There is still a segfault error currently.