Added base version of solution