Tons of changes, basic functionality and pattern now in place