finally finished???!!!!! minus small changes from customer