Got rid of weird custom options stuff; started reworking as an object