Working a bit.
Revert "Working a bit." Darn binary.

This reverts commit 8facefacec97ca765e7c4841c25bf0cb18da36f4.
Finally working a bit.