Added basic functionality and transitional framework