Side by side

Not ready for merge, but I want to comment on some changes