First commit of additional features