Gonna make some big changes, this commit message is useless I just needed a checkpoint