Merged Project

Merged two versions we had.