Refactor ALLLL TEH THINGS.