Moved junk into the back-end