Working

Added more stuff