WIP

More WIP, still not working properly yet!