Cleaned up Solution

To prepare for sharing possible bug with WAK folks