Removed extras not needed. Should be almost all working.