Fixed it.
Move functionality into main library.