6 Commits (refactor_future_hack)