Beta Commit

Beta Version, ready for testing !