Commit of version 1

Working version tested on localhost