Update aug2018

Done

Future ideas