Removing try catch block because this should be down at a higher level
Fixing some @todo's