some work to assignment 7.1

Signed-off-by: fallenangelX <http://infinity.3utilities.com/>