Worked a bit on the thingie