Fixed constructors and using different syntax. Added self to atomic factors.