v2.0 - Got a test version of all functions working