Cleaned up to focus on 2i interface