Updated gui?
Updated testing