some more stuff but not done