#52 - Started working on new preference system