First push... lot of changes still to be made

Beta test 1.0