Is what exists now suitable? (See latest commit)