done for now...need feedback