Added 3 classes, implemented 2 NumberFields, tested, works properly