Stage 2

Misc Changes