and more

completed… I think