Initial commit. Basic functionality working