Revert "Revert "Initial commit_paint""

This reverts commit aa1a6cfb51409e6cdc09208a0f33805125994811.