Just about working, need to fix default behaviour