changing over v3 stuff to m5 focused copy, forgot to check this in last night so I'm doing it now