Added in support for GET Parameters and did a little refactoring