updated main, still need to TODO in cashmaschine