Majority of work on mapping api types to EF types completed. Moved mapping functions into own class.