Update interface
Move stuff about; add basic CHECK support