Added simple mode and wrapped up testing