Work in progress. Better commit messages to come.

Signed-off-by: KentJames <jameschristopherkent@gmail.com>