Options Added

Clean up needed and method to target one screen... class conflicts at the moment