Revert "Revert "Should fix the coin issue""

This reverts commit a126718be6722227c27bf0b577fe06cb55cbd121.
Revert "Revert "Just some final touches for now""

This reverts commit 7a0c26f051dd55f4d261a7e31a354456b303add4.