Fixed indentation errors
Expanded proposal again, version 2 now