Hand swap in progress. Bug fixes to fusion listed in todo