Begining major changes/cleanup