Systemtest works. Gief refactorz for speedz