Added atomic version

Fixed a lot of stupid errors from the last commit. Apparently I was
really sleepy.