Pre-Final Version 3.0

Changes are coming