merging stuff
added tower files