Finished fondling the code. Aptitude loves me!