Magnet Train and drumkits.

Forgot some old commits.