Revert "Initial Prototype *fixed"

This reverts commit d87480985caf6ccf23f38c23d501276748819c5a.