More gui work, more testing to do.