Code seems to be working now!
commenting and testing