Removed all old code. All orignal code has been rewritten now.