I'm pretty much done collecting tanks for now. I've run out of room in my house.

I have peaceful and semi-aggressive fish, and some aggressive ones such as puffers. Here's a quick rundown:
Bettas, African dwarf frog, dwarf puffers, green spotted puffer, modestus (golden) puffers, otos, cherry barbs, SAEs, bristlenose plecos, pitbull plecos, dwarf gouramis, German Blue rams, white cloud mountain minnows, guppies, black lyretail mollies, zebra danios, stonelappers, tiger barbs (green, blushing and albino), corydoras, kuhli loaches, electric blue jack dempseys, red tailed black shark, baby whale, rosy barbs, Amano shrimp, cherry shrimp, bamboo/wood shrimp, ghost shrimp, mystery snails, ramshorn snails and nerite snails.
That's all I cam remember off the top of my head.