#17 cleaned up the code. Giving this up for now....