Huge changes, nearly finished with full layout