Additional Feature done

Yet bugs remain to be found