Started to work on the more complex architecture