I'm not convinced these are ready to pull, but at least they are a step in the right direction.

@KyleCartmell