my will to refactor this is limited so looking to maintain the old code as much as possible