Cleaned up, moved system to use https