Final push before I merge

Sick of working on a different branch
Signed-off-by:Nathan2055 <spychicken2055+code@gmail.com>