More catchup..

Signed-off-by: codemac <j@codemac.net>
Catching up, holy crap.