Features written and tests passing for #105