WIP: cleaner shell