FINAL COMMIT

Final code