V0.02 Update - Added more functionality