Moved stuff around, decided not to have the zune classes as the end results.