Initial commit for Version 2.0
big merge - this may break EVERYTHING