Latest work on Version 1.5

Signed-off-by: Noah <n.kovacs1@icloud.com>