Refactor/moar options