stuff
Hopefully merged things together properly
additional stuff