Initial commit of working system