Revert "Fixed?"

This reverts commit cb69e024bba836544c4de7b99d902d38a8e7d378.
Revert "BAD!"

This reverts commit dff861fc155b7af916b32ff544ea12f1101a39e3.

Conflicts:
	Test/Test/Form1.Designer.cs
Progress?
Revert "Will this work?"

This reverts commit 1efce207c57ed59f7bbaa31ff888253756a2bd03.