Moved Rank type to Rankings and improved Main