Redesigned to organise functionality more around type instead of action