Added basic non-working class architecture