More cleanup to do and loop needs fixing