Cleaned up a bit, broke connected requests into own class