Finished up commits

Signed-off-by: Shawn Campbell <jaegerpicker@gmail.com>