this stuff totally needs tracking too