Working on more features, adding more code

Published --