Feature/stockgrab

Lots of lovely updates