Cleaned everything up, but also will have added netbeans compatablilty with tis project