Almost finished version

Added set method, and more comments