Final commit of branch with all functionality