adds some rebase love
adds hoarders and more