added type + timestamp - closes #44