Building the core of #1 - Tests Added