Begun add supplier, cleaned up login code