alsdkjf
started cleaning  up code