Clean up interface and refactor some isos

How does the interface look now?