1-6  Working

All functions working properly now