Added a bit of build stuff and code