Initial import of ACID project