Everything Set

Unit Tests done!