Clean up and new class with new frontiers :D