Finished features
Added tests
removed swp files