pretty much back to functionality before refactor. transport controls, metadata