Aseoista local

Ready to be merged