Commented old target functions, started on new ones