Cleaned out old files, bug fixing still