Got most features done so it can be tested wtih

Got most features done so you can test with it.
Added more tests