Adding some more controls... though, most don't work yet