Version3, needs cleanup but no known bugs

Done with V3