Broke out code into multiple files, created some ACI tests