Polish; this should complete a basic protocol

tests to come soon