[WIP]: just some organization and tests good to go.