Editing some stuff so it all works now