Fixed Up

Fix the junker's core functionality