Finally merge feature/atomic-operations

This is it!