Refactored project. Much easier to follow / use now.