added stage 2 funcs and also edited some from stage 1....no idea how to test them though..need to get together to work on testing. Also, I really dk if I did stage 2 funcs correctly. I got really confused half way and changed it like a gazillion times, but we'll see....AHHHHHH