Functionality completed.
Final commit