Refactor, + updated for Gotham