Testing complete with Ninefold, it's not perfect, but it works and closes #34