Just use all the space
Make this it's own package