Re-working code into prettiness, algorithms nearing completion