wip: make this not look like a pile of trash