Some more stuff. Does not work too well yet.