Adding the start of an options system
Fixing resource usage