Untested, but implemented AC support

Update #4