Settings stuff is now in an extra branch