Finally some working stuff. Unfortunately something else broke.