Should be working version

Think I fixed all single point break errors, updated to match the newer
version as much as possible