Still works... 
Starting to clean things up.