added measurements , steps stripped out todo functionality to rewrite