mostly done might add finishing touches