Now in working status

	* Work remaining: cosmetic changes

Signed-off-by: skrech <skrechy@gmail.com>