Some progress, might even work