Moved to flat file testing =D