assets: closes #13 and #23