Cleaning Up Logic WIP