Done separating the native functions, fixes #3