Basic functionality working
merge