Fixed #205

Perhaps some small bugs still present but nothing significant.
Form Portion #205