Initial commit of already working code completed earlier this week.