More progress...split up some files. Working on slerp