Fixed Everything so that it works
Mikes first Merge, Hey that wasn't so bad