Adding Option Factory and Some Math Stuff