Fair bit of rewriting of CustomWrappedStack (now just WrappedStack).
Will make for easier API related stuffs