Decided that this should be its own package