removed old comment
refactored a bit
finally started testing as shit was getting out of hand