Some big improvements being made, check on us again later

Overall progress so far