Final overhaul

This should be the last major update.