Temp fix, will need to created a cleaner method of request parsing