Some more stuff, should be tested on the pi