Finish Desigining
Finish cleaning up rspec