slight tweaks and starting to add more instances