Slowly converting my base to Atriedes design