WIP: [#1]: Athena Rewrite #1

Draft
nxbat wants to merge 14 commits from athena-rewrite into dev

14 Commits