IP Problem Fix

Still have a few more things left to be implemented