Working Version Ready for Turn In

Signed-off-by: Bryan Reilly <94bryanr@gmail.com>