diff --git a/pitfall/restructure/number-test.rkt b/pitfall/restructure/number-test.rkt
new file mode 100644
index 00000000..e39b3aea
--- /dev/null
+++ b/pitfall/restructure/number-test.rkt
@@ -0,0 +1,544 @@
+#lang restructure/racket
+(require "number.rkt" "stream.rkt" rackunit)
+
+#|
+approximates
+https://github.com/mbutterick/restructure/blob/master/test/Number.coffee
+|#
+
+;describe 'Number', ->
+;  describe 'uint8', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xab, 0xff]
+;      uint8.decode(stream).should.equal 0xab
+;      uint8.decode(stream).should.equal 0xff
+
+(let ([stream (+DecodeStream (bytes #xab #xff))])
+  (check-equal? (send uint8 decode stream) #xab)
+  (check-equal? (send uint8 decode stream) #xff))
+;
+;    it 'should have a size', ->
+;      uint8.size().should.equal 1
+
+(check-equal? (send uint8 size) 1)
+
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xab, 0xff]
+;        done()
+;
+;      uint8.encode(stream, 0xab)
+;      uint8.encode(stream, 0xff)
+;      stream.end()
+
+(let ([stream (+EncodeStream)])
+  (send uint8 encode stream #xab)
+  (send uint8 encode stream #xff)
+  (check-equal? (send stream dump) (bytes #xab #xff)))
+
+
+;
+;  describe 'uint16', ->
+;    it 'is an alias for uint16be', ->
+;      uint16.should.equal uint16be
+
+;; modified test: `uint16` is the same endianness as the platform
+(check-equal? (send uint16 decode (bytes 0 1)) (send (if (system-big-endian?)
+                                                             uint16be
+                                                             uint16le) decode (bytes 0 1)))
+
+;
+;  describe 'uint16be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xab, 0xff]
+;      uint16be.decode(stream).should.equal 0xabff
+
+(let ([stream (+DecodeStream (bytes #xab #xff))])
+  (check-equal? (send uint16be decode stream) #xabff))
+
+
+;
+;    it 'should have a size', ->
+;      uint16be.size().should.equal 2
+
+(check-equal? (send uint16be size) 2)
+
+
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xab, 0xff]
+;        done()
+;
+;      uint16be.encode(stream, 0xabff)
+;      stream.end()
+
+(let ([stream (+EncodeStream)])
+  (send uint16be encode stream #xabff)
+  (check-equal? (send stream dump) (bytes #xab #xff)))
+
+
+;
+;  describe 'uint16le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab]
+;      uint16le.decode(stream).should.equal 0xabff
+
+(let ([stream (+DecodeStream (bytes #xff #xab))])
+  (check-equal? (send uint16le decode stream) #xabff))
+
+;
+;    it 'should have a size', ->
+;      uint16le.size().should.equal 2
+
+(check-equal? (send uint16le size) 2)
+
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab]
+;        done()
+;
+;      uint16le.encode(stream, 0xabff)
+;      stream.end()
+
+(let ([stream (+EncodeStream)])
+  (send uint16le encode stream #xabff)
+  (check-equal? (send stream dump) (bytes #xff #xab)))
+
+;
+;  describe 'uint24', ->
+;    it 'is an alias for uint24be', ->
+;      uint24.should.equal uint24be
+
+;; modified test: `uint24` is the same endianness as the platform
+(check-equal? (send uint24 decode (bytes 0 1 2)) (send (if (system-big-endian?)
+                                                             uint24be
+                                                             uint24le) decode (bytes 0 1 2)))
+
+;
+;  describe 'uint24be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab, 0x24]
+;      uint24be.decode(stream).should.equal 0xffab24
+
+(let ([stream (+DecodeStream (bytes #xff #xab #x24))])
+  (check-equal? (send uint24be decode stream) #xffab24))
+
+;
+;    it 'should have a size', ->
+;      uint24be.size().should.equal 3
+
+(check-equal? (send uint24be size) 3)
+
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab, 0x24]
+;        done()
+;
+;      uint24be.encode(stream, 0xffab24)
+;      stream.end()
+
+(let ([stream (+EncodeStream)])
+  (send uint24be encode stream #xffab24)
+  (check-equal? (send stream dump) (bytes #xff #xab #x24)))
+
+;
+;  describe 'uint24le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x24, 0xab, 0xff]
+;      uint24le.decode(stream).should.equal 0xffab24
+
+(let ([stream (+DecodeStream (bytes #x24 #xab #xff))])
+  (check-equal? (send uint24le decode stream) #xffab24))
+
+
+;
+;    it 'should have a size', ->
+;      uint24le.size().should.equal 3
+
+(check-equal? (send uint24le size) 3)
+
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x24, 0xab, 0xff]
+;        done()
+;
+;      uint24le.encode(stream, 0xffab24)
+;      stream.end()
+
+(let ([stream (+EncodeStream)])
+  (send uint24le encode stream #xffab24)
+  (check-equal? (send stream dump) (bytes #x24 #xab #xff)))
+
+;
+;  describe 'uint32', ->
+;    it 'is an alias for uint32be', ->
+;      uint32.should.equal uint32be
+
+;; modified test: `uint32` is the same endianness as the platform
+(check-equal? (send uint32 decode (bytes 0 1 2 3)) (send (if (system-big-endian?)
+                                                             uint32be
+                                                             uint32le) decode (bytes 0 1 2 3)))
+
+;
+;  describe 'uint32be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab, 0x24, 0xbf]
+;      uint32be.decode(stream).should.equal 0xffab24bf
+;
+;    it 'should have a size', ->
+;      uint32be.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab, 0x24, 0xbf]
+;        done()
+;
+;      uint32be.encode(stream, 0xffab24bf)
+;      stream.end()
+
+(let ([stream (+DecodeStream (bytes #xff #xab #x24 #xbf))])
+  (check-equal? (send uint32be decode stream) #xffab24bf))
+
+(check-equal? (send uint32be size) 4)
+
+(let ([stream (+EncodeStream)])
+  (send uint32be encode stream #xffab24bf)
+  (check-equal? (send stream dump) (bytes #xff #xab #x24 #xbf)))
+
+;
+;  describe 'uint32le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xbf, 0x24, 0xab, 0xff]
+;      uint32le.decode(stream).should.equal 0xffab24bf
+;
+;    it 'should have a size', ->
+;      uint32le.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xbf, 0x24, 0xab, 0xff]
+;        done()
+;
+;      uint32le.encode(stream, 0xffab24bf)
+;      stream.end()
+
+(let ([stream (+DecodeStream (bytes #xbf #x24 #xab #xff))])
+  (check-equal? (send uint32le decode stream) #xffab24bf))
+
+(check-equal? (send uint32le size) 4)
+
+(let ([stream (+EncodeStream)])
+  (send uint32le encode stream #xffab24bf)
+  (check-equal? (send stream dump) (bytes #xbf #x24 #xab #xff)))
+
+
+;
+;  describe 'int8', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x7f, 0xff]
+;      int8.decode(stream).should.equal 127
+;      int8.decode(stream).should.equal -1
+;
+;    it 'should have a size', ->
+;      int8.size().should.equal 1
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x7f, 0xff]
+;        done()
+;
+;      int8.encode(stream, 127)
+;      int8.encode(stream, -1)
+;      stream.end()
+
+(let ([stream (+DecodeStream (bytes #x7f #xff))])
+  (check-equal? (send int8 decode stream) 127)
+  (check-equal? (send int8 decode stream) -1))
+
+(check-equal? (send int8 size) 1)
+
+(let ([stream (+EncodeStream)])
+  (send int8 encode stream 127)
+  (send int8 encode stream -1)
+  (check-equal? (send stream dump) (bytes #x7f #xff)))
+
+
+;
+;  describe 'int16', ->
+;    it 'is an alias for int16be', ->
+;      int16.should.equal int16be
+;
+;  describe 'int16be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab]
+;      int16be.decode(stream).should.equal -85
+;
+;    it 'should have a size', ->
+;      int16be.size().should.equal 2
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab]
+;        done()
+;
+;      int16be.encode(stream, -85)
+;      stream.end()
+;
+;  describe 'int16le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xab, 0xff]
+;      int16le.decode(stream).should.equal -85
+;
+;    it 'should have a size', ->
+;      int16le.size().should.equal 2
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xab, 0xff]
+;        done()
+;
+;      int16le.encode(stream, -85)
+;      stream.end()
+;
+;  describe 'int24', ->
+;    it 'is an alias for int24be', ->
+;      int24.should.equal int24be
+;
+;  describe 'int24be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab, 0x24]
+;      int24be.decode(stream).should.equal -21724
+;
+;    it 'should have a size', ->
+;      int24be.size().should.equal 3
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab, 0x24]
+;        done()
+;
+;      int24be.encode(stream, -21724)
+;      stream.end()
+;
+;  describe 'int24le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x24, 0xab, 0xff]
+;      int24le.decode(stream).should.equal -21724
+;
+;    it 'should have a size', ->
+;      int24le.size().should.equal 3
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x24, 0xab, 0xff]
+;        done()
+;
+;      int24le.encode(stream, -21724)
+;      stream.end()
+;
+;  describe 'int32', ->
+;    it 'is an alias for int32be', ->
+;      int32.should.equal int32be
+;
+;  describe 'int32be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xff, 0xab, 0x24, 0xbf]
+;      int32be.decode(stream).should.equal -5561153
+;
+;    it 'should have a size', ->
+;      int32be.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xff, 0xab, 0x24, 0xbf]
+;        done()
+;
+;      int32be.encode(stream, -5561153)
+;      stream.end()
+;
+;  describe 'int32le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xbf, 0x24, 0xab, 0xff]
+;      int32le.decode(stream).should.equal -5561153
+;
+;    it 'should have a size', ->
+;      int32le.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xbf, 0x24, 0xab, 0xff]
+;        done()
+;
+;      int32le.encode(stream, -5561153)
+;      stream.end()
+;
+;  describe 'float', ->
+;    it 'is an alias for floatbe', ->
+;      float.should.equal floatbe
+;
+;  describe 'floatbe', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x43, 0x7a, 0x8c, 0xcd]
+;      floatbe.decode(stream).should.be.closeTo 250.55, 0.005
+;
+;    it 'should have a size', ->
+;      floatbe.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x43, 0x7a, 0x8c, 0xcd]
+;        done()
+;
+;      floatbe.encode(stream, 250.55)
+;      stream.end()
+;
+;  describe 'floatle', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xcd, 0x8c, 0x7a, 0x43]
+;      floatle.decode(stream).should.be.closeTo 250.55, 0.005
+;
+;    it 'should have a size', ->
+;      floatle.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xcd, 0x8c, 0x7a, 0x43]
+;        done()
+;
+;      floatle.encode(stream, 250.55)
+;      stream.end()
+;
+;  describe 'double', ->
+;    it 'is an alias for doublebe', ->
+;      double.should.equal doublebe
+;
+;  describe 'doublebe', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x40, 0x93, 0x4a, 0x3d, 0x70, 0xa3, 0xd7, 0x0a]
+;      doublebe.decode(stream).should.be.equal 1234.56
+;
+;    it 'should have a size', ->
+;      doublebe.size().should.equal 8
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x40, 0x93, 0x4a, 0x3d, 0x70, 0xa3, 0xd7, 0x0a]
+;        done()
+;
+;      doublebe.encode(stream, 1234.56)
+;      stream.end()
+;
+;  describe 'doublele', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x0a, 0xd7, 0xa3, 0x70, 0x3d, 0x4a, 0x93, 0x40]
+;      doublele.decode(stream).should.be.equal 1234.56
+;
+;    it 'should have a size', ->
+;      doublele.size().should.equal 8
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x0a, 0xd7, 0xa3, 0x70, 0x3d, 0x4a, 0x93, 0x40]
+;        done()
+;
+;      doublele.encode(stream, 1234.56)
+;      stream.end()
+;
+;  describe 'fixed16', ->
+;    it 'is an alias for fixed16be', ->
+;      fixed16.should.equal fixed16be
+;
+;  describe 'fixed16be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x19, 0x57]
+;      fixed16be.decode(stream).should.be.closeTo 25.34, 0.005
+;
+;    it 'should have a size', ->
+;      fixed16be.size().should.equal 2
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x19, 0x57]
+;        done()
+;
+;      fixed16be.encode(stream, 25.34)
+;      stream.end()
+;
+;  describe 'fixed16le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x57, 0x19]
+;      fixed16le.decode(stream).should.be.closeTo 25.34, 0.005
+;
+;    it 'should have a size', ->
+;      fixed16le.size().should.equal 2
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x57, 0x19]
+;        done()
+;
+;      fixed16le.encode(stream, 25.34)
+;      stream.end()
+;
+;  describe 'fixed32', ->
+;    it 'is an alias for fixed32be', ->
+;      fixed32.should.equal fixed32be
+;
+;  describe 'fixed32be', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0x00, 0xfa, 0x8c, 0xcc]
+;      fixed32be.decode(stream).should.be.closeTo 250.55, 0.005
+;
+;    it 'should have a size', ->
+;      fixed32be.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0x00, 0xfa, 0x8c, 0xcc]
+;        done()
+;
+;      fixed32be.encode(stream, 250.55)
+;      stream.end()
+;
+;  describe 'fixed32le', ->
+;    it 'should decode', ->
+;      stream = new DecodeStream new Buffer [0xcc, 0x8c, 0xfa, 0x00]
+;      fixed32le.decode(stream).should.be.closeTo 250.55, 0.005
+;
+;    it 'should have a size', ->
+;      fixed32le.size().should.equal 4
+;
+;    it 'should encode', (done) ->
+;      stream = new EncodeStream
+;      stream.pipe concat (buf) ->
+;        buf.should.deep.equal new Buffer [0xcc, 0x8c, 0xfa, 0x00]
+;        done()
+;
+;      fixed32le.encode(stream, 250.55)
+;      stream.end()
\ No newline at end of file
diff --git a/pitfall/restructure/number.rkt b/pitfall/restructure/number.rkt
index 7a1d3f7c..88048064 100644
--- a/pitfall/restructure/number.rkt
+++ b/pitfall/restructure/number.rkt
@@ -41,18 +41,23 @@ https://github.com/mbutterick/restructure/blob/master/src/Number.coffee
 
   (define/augride (decode stream . args)
     (define bstr (send stream read _size))
-    (if (= 1 _size)
-        (+ (bytes-ref bstr 0) (if _signed? bound-min 0))
-        (integer-bytes->integer bstr _signed? (eq? endian 'be))))
+    (let loop ([bstr bstr])
+      (if (odd? (bytes-length bstr))
+          (loop (if (eq? endian 'be) (bytes-append (bytes (if _signed? 255 0)) bstr) (bytes-append bstr (bytes (if _signed? 255 0)))))
+          (integer-bytes->integer bstr _signed? (eq? endian 'be)))))
 
   (define/augride (encode stream val-in)
     (define val (if (integer? val-in) (inexact->exact val-in) val-in))
     ;; todo: better bounds checking
     (unless (<= bound-min val bound-max)
       (raise-argument-error 'Number:encode (format "value within range of ~a ~a-byte int (~a to ~a)" (if _signed? "signed" "unsigned") _size bound-min bound-max) val))
-    (define bstr (if (= 1 _size)
-                     (bytes (- val (if _signed? bound-min 0)))
-                     (integer->integer-bytes val _size _signed? (eq? endian 'be))))
+    (define bstr (let loop ([_size _size])
+                   (if (odd? _size)
+                       (let ([bstr (loop (add1 _size))])
+                         (if (eq? endian 'be)
+                             (subbytes bstr 1)
+                             (subbytes bstr 0 (sub1 (bytes-length bstr)))))
+                       (integer->integer-bytes val _size _signed? (eq? endian 'be)))))
     (send stream write bstr)))
 
 (define-subclass* Number (Fixed size [fixed-endian (if (system-big-endian?) 'be 'le)] [fracBits (floor (/ size 2))])
@@ -143,3 +148,10 @@ https://github.com/mbutterick/restructure/blob/master/src/Number.coffee
  (define ds (+DecodeStream (send es dump)))
  (check-equal? (ceiling (* (send fixed16be decode ds) 100)) 12345.0))
 
+(send int8 decode (bytes 255))
+(send int16le decode (bytes 255 255))
+
+(send int8 encode #f -1)
+(send int16le encode #f -1)
+(integer-bytes->integer (bytes 0 255) #t #t)
+(integer->integer-bytes -1 2 #t #t)
\ No newline at end of file