Continued work, have a segfault currently to work out on XF1