Manual testing, works now after some major bug fixes