cap initial commit - DON'T MERGE