Move to a saner approach
3 files changed