Final commit with all functionality.