Completed code reviews, decided to use this code base, corrected issues.