MORE FINAL

This one should be MOSTLY done...mostly..kinda...maybe...probably not
though