diff --git a/port/forms.py b/port/forms.py
index c2dc199..d9285c3 100644
--- a/port/forms.py
+++ b/port/forms.py
@@ -7,7 +7,7 @@ from phonenumber_field.formfields import PhoneNumberField
 
 from .models import *
 
-class PersonForm(Form):
+class PersonForm(ModelForm):
     class Meta:
         model = Person
 
@@ -26,7 +26,7 @@ class PersonForm(Form):
     phone = PhoneNumberField(label='Phone Number')
     """
 
-class AddressForm(Form):
+class AddressForm(ModelForm):
     class Meta:
         model = Address
 
@@ -86,7 +86,7 @@ class PortForm(ModelForm):
     company = CharField(label='Company', max_length=50)
     """
 
-class PlugForm(Form):
+class PlugForm(ModelForm):
     class Meta:
         model = Plug
         
@@ -112,7 +112,7 @@ class PlugForm(Form):
 
 PlugFormSet = formset_factory(PlugForm)
 
-class TapForm(Form):
+class TapForm(ModelForm):
     class Meta:
         model = Tap
 
@@ -125,5 +125,5 @@ class TapForm(Form):
 
 TapFormSet = formset_factory(TapForm)
 
-class BoatForm(Form):
-    
+class BoatForm(ModelForm):
+    pass