starting to add proper management
merge