Clean up
still fucked up
new idea