We describe our progress toward an NSOM system intended for fluorescence imaging of biological samples. This process included integration of shear-force feedback into an existing NSOM system. Topographic images acquired using uncoated tips are presented. We also present our initial effort at simultaneous acquisition of topographic and fluorescence data using an aluminum coated tip.