major updates still more todos though