Got everything working without plugins