removed all non-tested implementation code, GUI unchanged