Update main

Fixed negative issue. Now onto the testing phase.