Some cleanup
Some new input
Some new code here