Internal rewrite

Cleaned up the old and crufty code while hopefully maintaining the core functionality.