Old code was messy as hell, starting over