Complete refactor and restructure. It's way prettier now!