cleaned up imports
initial com stuff