-Corrected some left over mess, the code now works