Minor changes
merge
Reimplementing basic functionality