New custom bt logic and athena_map fixes#20

mdurrani808 wants to merge 3 commits intoumdloop:mainumdloop/athena-code:mainfrom

mdurrani808:new-custom-btmdurrani808/athena-code:new-custom-btCopy head branch name to clipboard