Started to add in more instruments, tighten architecture and some new features and stubs