Initial Commit
Updated some references

Tests are still broken