Rewrite and initial 1.6.2 update

Signed-off-by: ShadowChild <shadychild@gmail.com>