Initial commit

Still in testing phase