Inital Working - CLEANUP