First pass at adding a bunch of new preferences and options