WIP for tests and package bullshit