Ready for testing

All files tested for functionality