Wrapping and display code tentatively finished, highly untested

COMPILES; UNTESTED; BUGGED