Initial commit base functionality working