Cleaned up repo to allow for icenium integration (original version in branch original