squeaky clean @elohour

wip!

finishing this later :P