Saving all these changes for now, then refactoring such that the binary becomes more important than the library.