Version 12 (final)

Version 12 finishes our project