More booleans, work on rewriting main function to match
Update main function to match new booleans
Further work on rewriting main