Reinei test

I think energy and things are good enough to get back into the masterbranch