Continuation of previous commit (adds missing files)